Skip to content

Rollup of 7 pull requests #108743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 14 commits into from
Closed

Rollup of 7 pull requests #108743

wants to merge 14 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

onur-ozkan and others added 14 commits March 3, 2023 01:50
@onur-ozkan
fix inconsistent json outputs from rustdoc
df061c8 
Signed-off-by: ozkanonur <[email protected]>
@Teapot4195
./configure script should only show blocks (and associated comments) …
00f98e6 
…where it is not default
@chenyukang
Remove unclosed_delims from parser
d1073fa
@estebank
Properly colorize multi-part suggestions in the same line
6fd1751 
Fix rust-lang#108547.
@clubby789
rustdoc: Note in a type's layout/size if it is uninhabited
7520155
@clubby789
Remove allow(potential_query_instability) from ast_passes
ee41ba5
@notriddle
rustdoc: function signature search with traits in where clause
9d27028
@matthiaskrgr
Rollup merge of rust-lang#108626 - ozkanonur:consistent-json-docs, r=…
b850cee 
…aDotInTheVoid

rustdoc-json: switch from HashMap to FxHashMap to fix non-determinism

Using `HashMap` in `rustdoc_json_types::Crate` were causing creating randomly ordered objects in the json doc files. Which might cause problems to people who are doing comparison on those files specially in CI pipelines. See rust-lang#103785 (comment)

This PR fixes that issue and extends the coverage of `tests/run-make/rustdoc-verify-output-files` testing ability.
@matthiaskrgr
Rollup merge of rust-lang#108627 - estebank:suggestion-hightlight, r=…
13ed88a 
…WaffleLapkin

Properly colorize multi-part suggestions in the same line

Fix rust-lang#108547.
@matthiaskrgr
Rollup merge of rust-lang#108632 - Teapot4195:issue-108612-fix, r=ozk…
ba9b31f 
…anonur

Omit unchanged options from config.toml in `configure.py`

Leaves section tags, but removes options that are unchanged.
Change in `config.toml.example` is to prevent comments from sneaking in by being directly after a section tag

closes rust-lang#108612
@matthiaskrgr
Rollup merge of rust-lang#108715 - chenyukang:yukang/cleanup-parser-d…
223e47c 
…elims, r=compiler-errors

Remove unclosed_delims from parser

After landing rust-lang#108297
we could remove `unclosed_delims` from the parser now.
@matthiaskrgr
Rollup merge of rust-lang#108723 - notriddle:notriddle/where-clause, …
6c9a99e 
…r=GuillaumeGomez

rustdoc: function signature search with traits in `where` clause

## Before

![image](https://user-images.githubusercontent.com/1593513/222873534-a640a72a-c654-4702-9f3b-175129d9591d.png)

## After

![image](https://user-images.githubusercontent.com/1593513/222873544-fdfc431d-2b65-4b56-bede-0302ea9f153a.png)
@matthiaskrgr
Rollup merge of rust-lang#108734 - clubby789:rustdoc-layout-uninhabit…
f2ae034 
…ed, r=GuillaumeGomez

rustdoc: Note in a type's layout/size if it is uninhabited

Closes rust-lang#87008

![image](https://user-images.githubusercontent.com/13556931/222900244-8e326d51-8d3b-4700-a935-96830179e2e9.png)
@matthiaskrgr
Rollup merge of rust-lang#108736 - clubby789:ast-passes-unstable, r=N…
db9f48d 
…ilstrieb

Remove `allow(potential_query_instability)` from `ast_passes`

cc rust-lang#84447
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 4, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Mar 4, 2023

📌 Commit db9f48d has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 4, 2023
@bors
Copy link
Collaborator

bors commented Mar 4, 2023

⌛ Testing commit db9f48d with merge 23193e3737a738537b9a419b3d48927d1de902d1...

@bors
Copy link
Collaborator

bors commented Mar 4, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 4, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 4, 2023
Merged
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-stable failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
    Checking askama_shared v0.12.0
error: unresolved link to `HashMap`
  --> src/rustdoc-json-types/lib.rs:56:71
   |
56 |     /// [`String`] is currently `["alloc", "string", "String"]` and [`HashMap`] is
   |                                                                       ^^^^^^^ no item named `HashMap` in scope
   |
   = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`
   = note: `-D rustdoc::broken-intra-doc-links` implied by `-D warnings`
error: could not document `rustdoc-json-types`

Caused by:
Caused by:
  process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --edition=2021 --crate-type lib --crate-name rustdoc_json_types src/rustdoc-json-types/lib.rs --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/doc -Zunstable-options --check-cfg 'values(feature)' --check-cfg 'names()' --check-cfg 'values()' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat -C metadata=1d9268e6f09b20e4 -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/release/deps --extern rustc_hash=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librustc_hash-5fa72dc46dd3b887.rmeta --extern serde=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libserde-ccb7310d6941ac0a.rmeta -Csymbol-mangling-version=v0 -Zunstable-options '--check-cfg=values(bootstrap)' '--check-cfg=values(parallel_compiler)' '--check-cfg=values(no_btreemap_remove_entry)' '--check-cfg=values(crossbeam_loom)' '--check-cfg=values(span_locations)' '--check-cfg=values(rustix_use_libc)' '--check-cfg=values(emulate_second_only_system)' -Dwarnings '-Wrustdoc::invalid_codeblock_attributes' --crate-version '1.69.0
  2023-03-04)' --document-private-items --enable-index-page --show-type-layout --generate-link-to-definition -Zunstable-options` (exit status: 1)
warning: build failed, waiting for other jobs to finish...
[RUSTC-TIMING] rustdoc_json_types test:false 3.782
[RUSTC-TIMING] askama_shared test:false 2.433

@matthiaskrgr matthiaskrgr deleted the rollup-0ucy57r branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-rustdoc-json Area: Rustdoc JSON backend rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@matthiaskrgr @bors @rust-log-analyzer @rustbot @onur-ozkan @Teapot4195 @chenyukang @estebank @clubby789 @notriddle